Blippy: Fix checks now that blueprints have sled subnets#9549
Merged
jgallagher merged 2 commits intomainfrom Jan 5, 2026
Merged
Blippy: Fix checks now that blueprints have sled subnets#9549jgallagher merged 2 commits intomainfrom
jgallagher merged 2 commits intomainfrom
Conversation
Blippy has had checks on sled subnet consistency for a while, but they were implemented by inferring each sled's subnet from its zones' IPs. We added explicit sled subnets to blueprints in #9416; this changes blippy's sled-subnet-related checks to use that new field. (This is work that fell out of a larger PR that isn't ready yet, and I'm opening it separately to reduce diff clutter in that PR.)
smklein
approved these changes
Dec 19, 2025
jgallagher
added a commit
that referenced
this pull request
Jan 8, 2026
This PR is large-ish but very boilerplatey. This is a prerequisite for the planner work to avoid reading expunged zones @smklein pointed out in #9521 (comment). We add a `last_allocated_ip_subnet_offset` field to `BlueprintSledConfig`, along with a `last_allocated_ip()` method that adds the offset to the sled's subnet. The rest is fallout of using that field: 1. Many expectorate changes to add a new "last allocated IP" line 2. New blippy check that no sled has a zone with an IP above the last allocated IP 3. The planner now uses this field when creating each sled's underlay IP allocator instead of scraping "all in-service and expunged zones" to find all the ever-used-on-this-sled IPs Staged on top of #9549.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Blippy has had checks on sled subnet consistency for a while, but they were implemented by inferring each sled's subnet from its zones' IPs. We added explicit sled subnets to blueprints in #9416; this changes blippy's sled-subnet-related checks to use that new field.
(This is work that fell out of a larger PR that isn't ready yet, and I'm opening it separately to reduce diff clutter in that PR.)